Skip to contentSkip to conversation

Change in openvpn[master]: tests: fork default automake test-driver

Openvpn-devel In review flichtenheld (Code Review) 3 participants 13 messages Dec 11, 2023 – Apr 3, 2024 1 message not in the archive Kbuild

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1702310034000.I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/478?usp=email

to review the following change.

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

We don't really like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

---
A forked-test-driver
M tests/Makefile.am
M tests/unit_tests/example_test/Makefile.am
M tests/unit_tests/openvpn/Makefile.am
M tests/unit_tests/plugins/auth-pam/Makefile.am

5 files changed, 157 insertions(+), 0 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/478/1

forked-test-driver new file +153 -0
new file mode 100755
index 0000000..be73b80
@@ -0,0 +1,153 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]...> or send patches to
+# <[email protected]...>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name NAME --log-file PATH --trs-file PATH
+              [--expect-failure {yes|no}] [--color-tests {yes|no}]
+              [--enable-hard-errors {yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
+END
+}
+
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
tests/Makefile.am +1 -0
index 6c71067..b3b2d74 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh
tests/unit_tests/example_test/Makefile.am +1 -0
index 1ae80c8..988366a 100644
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) example Unit-Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 check_PROGRAMS = example_testdriver example2_testdriver
 
tests/unit_tests/openvpn/Makefile.am +1 -0
index cecf4dc..80001bf 100644
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) Unit-Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 test_binaries=
 
tests/unit_tests/plugins/auth-pam/Makefile.am +1 -0
index ba32013..385922f 100644
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) auth_pam Plugin Unit-Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if ENABLE_PLUGIN_AUTH_PAM
 check_PROGRAMS = auth_pam_testdriver

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to reexamine a change. Please visit

    http://gerrit.openvpn.net/c/openvpn/+/478?usp=email

to look at the new patch set (#2).

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

---
M Makefile.am
A forked-test-driver
M tests/Makefile.am

3 files changed, 156 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/478/2

Makefile.am +2 -1
index 2305ab4..6deecf3 100644
@@ -44,7 +44,8 @@
 	debug \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 6c71067..b3b2d74 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newpatchset

#3 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld.

plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/478?usp=email )

Change subject: tests: fork default automake test-driver
......................................................................

Patch Set 2:

(1 comment)

Patchset:

PS2:
is there a way to include a diff from the default test-driver
in the commit message or a short summary what the actual change is?

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 13 Dec 2023 15:17:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

#4 lore raw
In reply to a message not in the archive

Attention is currently required from: plaisthos.

flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/478?usp=email )

Change subject: tests: fork default automake test-driver
......................................................................

Patch Set 2:

(1 comment)

Patchset:

PS2:

Quoted 1 line

is there a way to include a diff from the default test-driver […]

There is no change. I moved that to a separate commit intentionally. I can make this clearer in the commit message.

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Thu, 14 Dec 2023 10:48:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: plaisthos <[email protected]...>
Gerrit-MessageType: comment

#5 lore raw
In reply to a message not in the archive

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to reexamine a change. Please visit

    http://gerrit.openvpn.net/c/openvpn/+/478?usp=email

to look at the new patch set (#3).

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

Note that this commit does not change the test-driver in any way. We just copy the original version and change some tests to use it. Any changes will be done in separate commits, so we can track them.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

---
M Makefile.am
A forked-test-driver
M tests/Makefile.am

3 files changed, 156 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/478/3

Makefile.am +2 -1
index 2305ab4..6deecf3 100644
@@ -44,7 +44,8 @@
 	debug \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 6c71067..b3b2d74 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to reexamine a change. Please visit

    http://gerrit.openvpn.net/c/openvpn/+/478?usp=email

to look at the new patch set (#4).

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

---
M Makefile.am
A forked-test-driver
M tests/Makefile.am

3 files changed, 156 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/478/4

Makefile.am +2 -1
index 2305ab4..6deecf3 100644
@@ -44,7 +44,8 @@
 	debug \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 6c71067..b3b2d74 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newpatchset

#7 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld.

plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/478?usp=email )

Change subject: tests: fork default automake test-driver
......................................................................

Patch Set 6: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 6
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 25 Jan 2024 10:32:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#8 lore raw

PATCH v6 1/1 tests: fork default automake test-driver

In reply to a message not in the archive

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/478
This mail reflects revision 6 of this Change.

Acked-by according to Gerrit (reflected above):
Arne Schwabe <[email protected]...>

Makefile.am +2 -1
index 792588a..d93bd1b 100644
@@ -45,7 +45,8 @@
 	ltrc.inc \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 6c71067..b3b2d74 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh
#9 lore raw

[Openvpn-devel] [PATCH applied] Re: tests: fork default automake test-driver

Tested this in various build environments, including Ubuntu/MinGW, and GHA, and things still work & test "as before". Combined with the next commit, we get useful (for me) "I can see what make check is doing all the time" behaviour back.

Your patch has been applied to the master branch.

commit aea6e9aa854b454f98671382eb751662dd9e1e03

Author: Frank Lichtenheld
Date:   Thu Jan 25 12:00:36 2024 +0100
     tests: fork default automake test-driver

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg28132.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#10 lore raw
In reply to a message not in the archive

flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/478?usp=email )

Change subject: tests: fork default automake test-driver
......................................................................

Patch Set 8:

(1 comment)

Patchset:

PS8:
Some additional context for this patch and #479:

Originally the switch to parallel test framework was triggered by
https://gerrit.openvpn.net/c/openvpn/+/474 which required setting up additional environment. This is also possible in the serial-test framework, but was much more obvious with parallel.

The parallel test framework is the newer one which offers a lot more options for customization. It is recommended by automake authors. So I tested whether it works with our tests or whether there is any reason it wouldn't work. It works fine.

In parallel there was a discussion where cron2 complained about the test execution being too verbose, especially for the UTs. This is addressed by the parallel test framework which is much less verbose by default, but can't be addressed in serial-test framework.

The problem is that the parallel test framework default behavior is not desirable in t_client context since that runs for a long time and we would like to see live progress. This is solvable in the parallel test framework since it is very configurable, but it requires us forking the default test driver since the default test driver itself is not configurable. You need to override it. That is implemented by
https://gerrit.openvpn.net/c/openvpn/+/478 (copy test driver)
https://gerrit.openvpn.net/c/openvpn/+/479 (patch it)

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 8
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Comment-Date: Wed, 28 Feb 2024 13:03:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

#11 lore raw
In reply to a message not in the archive

Hello plaisthos,

I'd like you to reexamine a change. Please visit

    http://gerrit.openvpn.net/c/openvpn/+/478?usp=email

to look at the new patch set (#9).

The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

---
M Makefile.am
A forked-test-driver
M tests/Makefile.am

3 files changed, 156 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/478/9

Makefile.am +2 -1
index 792588a..d93bd1b 100644
@@ -45,7 +45,8 @@
 	ltrc.inc \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 6c71067..b3b2d74 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh
Signature · 12 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 9
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
#12 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#11) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/478?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by plaisthos

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28132.html

---
M Makefile.am
A forked-test-driver
M tests/Makefile.am

3 files changed, 156 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/478/11

Makefile.am +2 -1
index 439346e..87230fe 100644
@@ -45,7 +45,8 @@
 	ltrc.inc \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 2885752..5e9ad0a 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 11
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#13 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/478?usp=email )

Change subject: tests: fork default automake test-driver
......................................................................

tests: fork default automake test-driver

For some of the test we don't like the default log behavior and there seems no easy way to change that except to fork the driver. The license seems unproblematic since we're GPL anyway.

v2:
- Do not use forked-test-driver for UTs. Default behavior is fine for those.

Change-Id I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28132.html

---
M Makefile.am
A forked-test-driver
M tests/Makefile.am

3 files changed, 156 insertions(+), 1 deletion(-)
Makefile.am +2 -1
index 439346e..87230fe 100644
@@ -45,7 +45,8 @@
 	ltrc.inc \
 	CMakeLists.txt \
 	CMakePresets.json \
-	config.h.cmake.in
+	config.h.cmake.in \
+	forked-test-driver
 
 .PHONY: config-version.h doxygen
 
forked-test-driver new file +153 -0

153 lines not on this page · raw message

tests/Makefile.am +1 -0
index 2885752..5e9ad0a 100644
@@ -15,6 +15,7 @@
 SUBDIRS = unit_tests
 
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests'
+LOG_DRIVER = $(SHELL) $(top_srcdir)/forked-test-driver
 
 if !WIN32
 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/478?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I67d461afbcc9c06b1fc5ab4477141d7b8bd9ba8e
Gerrit-Change-Number: 478
Gerrit-PatchSet: 11
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged